From 61cd1a182fe95284235cb15fbbe3167d076ae0f6 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Fri, 13 May 2005 23:51:15 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.124 (42853d73dWp9gPjgpNWvy831DhnVnw) compile.h.in, Makefile: Change XEN_EXTRAVERSION to -testing, move surrounding-" to compile.h.in. Also define XEN_FULLVESION and use. Signed-off-by: Christian Limpach --- xen/Makefile | 5 +++-- xen/include/xen/compile.h.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 15239eb5e1..f17de889f6 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -10,7 +10,8 @@ INSTALL_DIR = $(INSTALL) -d -m0755 # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 2 export XEN_SUBVERSION = 0 -export XEN_EXTRAVERSION = "" +export XEN_EXTRAVERSION = -testing +export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) export BASEDIR := $(CURDIR) @@ -84,7 +85,7 @@ tools/figlet/figlet.o: tools/figlet/figlet.c $(CC) -o $@ -c $< include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf - tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new + tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) > $@.new @mv -f $@.new $@ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in index e5179509fb..440ecb25c1 100644 --- a/xen/include/xen/compile.h.in +++ b/xen/include/xen/compile.h.in @@ -7,7 +7,7 @@ #define XEN_VERSION @@version@@ #define XEN_SUBVERSION @@subversion@@ -#define XEN_EXTRAVERSION @@extraversion@@ +#define XEN_EXTRAVERSION "@@extraversion@@" #define XEN_CHANGESET "@@changeset@@" #define XEN_BANNER \ -- 2.30.2